Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Limit indexer workers using env var #3203

Merged
merged 1 commit into from
Oct 18, 2023
Merged

Limit indexer workers using env var #3203

merged 1 commit into from
Oct 18, 2023

Conversation

dhruvkb
Copy link
Member

@dhruvkb dhruvkb commented Oct 16, 2023

Fixes

Fixes https://github.com/WordPress/openverse-infrastructure/issues/653 by @AetherUnbound

Description

This PR allows the ingestion server to limit the number of indexer workers used in the indexing operation to a subset of all available workers.

This limit is set using an env var and prevents the need to actually change the number of workers provisioned in the infrastructure.

Testing Instructions

This is non-local change so it must be testing in live environment.

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin 
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@github-actions github-actions bot added the 🧱 stack: ingestion server Related to the ingestion/data refresh server label Oct 16, 2023
@openverse-bot openverse-bot added the 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work label Oct 16, 2023
@dhruvkb dhruvkb added 🟧 priority: high Stalls work on the project or its dependents 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository and removed 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work labels Oct 16, 2023
@dhruvkb dhruvkb marked this pull request as ready for review October 17, 2023 06:08
@dhruvkb dhruvkb requested a review from a team as a code owner October 17, 2023 06:08
sarayourfriend
sarayourfriend reviewed Oct 17, 2023
View reviewed changes
Copy link
Collaborator

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This limit is set using an env var and prevents the need to actually change the number of workers provisioned in the infrastructure.

Such a great idea! To avoid needing to re-provision to modify the environment variable, we can SSH into the ingestion server box and modify the environment variables in the docker-compose.yml, either manually or with Ansible, depending on whether we need to make this change before or after the Ansible setup is available.

Just one request for clarification about error recovery, but nothing major, and will approve as long as there's a clear course of action in case of a hypothetical misconfiguration issue.

ingestion_server/ingestion_server/distributed_reindex_scheduler.py Show resolved Hide resolved
sarayourfriend
sarayourfriend approved these changes Oct 17, 2023
View reviewed changes
Copy link
Collaborator

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

obulat
obulat approved these changes Oct 18, 2023
View reviewed changes
Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@dhruvkb dhruvkb merged commit 0bd4f63 into main Oct 18, 2023
68 of 75 checks passed
@dhruvkb dhruvkb deleted the reduced_workers branch October 18, 2023 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sarayourfriend sarayourfriend sarayourfriend approved these changes

@obulat obulat obulat approved these changes

Assignees
No one assigned
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟧 priority: high Stalls work on the project or its dependents 🧱 stack: ingestion server Related to the ingestion/data refresh server
Projects
Openverse PRs
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dhruvkb @obulat @sarayourfriend @openverse-bot